diff options
author | dbroqua <dbroqua@mousur.org> | 2016-08-23 13:39:49 +0200 |
---|---|---|
committer | dbroqua <dbroqua@mousur.org> | 2016-08-23 13:39:49 +0200 |
commit | e65252d591b88f3c108d40ea5eeda9d561bc237c (patch) | |
tree | 6e43f93f62aef905c2c5beeb46ef37a18c38e7e0 /tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/VSIX/[Content_Types].xml | |
parent | 92fe78a5ea98cc8ca36d74ce86c24fe284729c39 (diff) | |
parent | fb4452c2f5a80720fd56306ea4fa7c61a5e8040d (diff) | |
download | qmk_firmware-e65252d591b88f3c108d40ea5eeda9d561bc237c.tar.gz qmk_firmware-e65252d591b88f3c108d40ea5eeda9d561bc237c.tar.xz |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# keyboards/planck/keymaps/dbroqua/keymap.c
Diffstat (limited to 'tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/VSIX/[Content_Types].xml')
-rw-r--r-- | tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/VSIX/[Content_Types].xml | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/VSIX/[Content_Types].xml b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/VSIX/[Content_Types].xml index 05ef8b6ba..112d16994 100644 --- a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/VSIX/[Content_Types].xml +++ b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/VSIX/[Content_Types].xml @@ -1,13 +1,13 @@ -<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">
- <Default Extension="vsixmanifest" ContentType="text/xml"/>
- <Default Extension="cache" ContentType="text/xml"/>
- <Default Extension="png" ContentType="application/octet-stream"/>
- <Default Extension="txt" ContentType="text/plain"/>
- <Default Extension="xml" ContentType="text/xml"/>
- <Default Extension="zip" ContentType="application/octet-stream"/>
- <Default Extension="dll" ContentType="application/octet-stream" />
- <Default Extension="pkgdef" ContentType="text/plain" />
- <Default Extension="htm" ContentType="text/html" />
- <Default Extension="msha" ContentType="text/html" />
- <Default Extension="mshc" ContentType="application/octet-stream"/>
-</Types>
+<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types"> + <Default Extension="vsixmanifest" ContentType="text/xml"/> + <Default Extension="cache" ContentType="text/xml"/> + <Default Extension="png" ContentType="application/octet-stream"/> + <Default Extension="txt" ContentType="text/plain"/> + <Default Extension="xml" ContentType="text/xml"/> + <Default Extension="zip" ContentType="application/octet-stream"/> + <Default Extension="dll" ContentType="application/octet-stream" /> + <Default Extension="pkgdef" ContentType="text/plain" /> + <Default Extension="htm" ContentType="text/html" /> + <Default Extension="msha" ContentType="text/html" /> + <Default Extension="mshc" ContentType="application/octet-stream"/> +</Types> |